From 170f6a7acee492bdc6f7c039f4e8bc65d3465a17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Beno=C3=AEt=20Minisini?= Date: Sat, 7 Feb 2026 13:30:57 +0100 Subject: [PATCH] Make 'gb.pdf' compile with poppler >= 26.1.0. [GB.PDF] * NEW: Make 'gb.pdf' compile with poppler >= 26.1.0. Origin: https://gitlab.com/gambas/gambas/-/commit/78bf774fa00b07194ba24efa7fa0e989e5271e2a Gbp-Pq: Name Make-gb.pdf-compile-with-poppler-26.1.0.patch --- gb.pdf/configure.ac | 2 ++ gb.pdf/src/CPdfDocument.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac index 0ed70ba9..c567fe67 100644 --- a/gb.pdf/configure.ac +++ b/gb.pdf/configure.ac @@ -46,6 +46,8 @@ if test "$have_poppler" = "yes"; then AC_DEFINE_UNQUOTED(POPPLER_VERSION_25_01_0, $((1-$?)), Poppler version >= 25.01.0) $PKG_CONFIG --atleast-version=25.12.0 poppler AC_DEFINE_UNQUOTED(POPPLER_VERSION_25_12_0, $((1-$?)), Poppler version >= 25.12.0) + $PKG_CONFIG --atleast-version=26.01.0 poppler + AC_DEFINE_UNQUOTED(POPPLER_VERSION_26_01_0, $((1-$?)), Poppler version >= 26.01.0) fi AC_CONFIG_FILES([\ diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp index b08e5528..0041ac8f 100644 --- a/gb.pdf/src/CPdfDocument.cpp +++ b/gb.pdf/src/CPdfDocument.cpp @@ -1061,7 +1061,11 @@ BEGIN_METHOD(PDFPAGE_select, GB_INTEGER X; GB_INTEGER Y; GB_INTEGER W; GB_INTEGE THIS->page->display(gfx); dev->endPage(); - str=dev->getText((double)x,(double)y,(double)(w+x),(double)(h+y)); +#if POPPLER_VERSION_26_01_0 + str = dev->getText(PDFRectangle((double)x,(double)y,(double)(w+x),(double)(h+y))); +#else + str = dev->getText((double)x,(double)y,(double)(w+x),(double)(h+y)); +#endif #if !(POPPLER_VERSION_24_12_0) delete gfx; -- 2.30.2